Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

genesis validators (bp #7235)#7250

Closed
mergify[bot] wants to merge 2 commits into
v0.21from
mergify/bp/v0.21/pr-7235
Closed

genesis validators (bp #7235)#7250
mergify[bot] wants to merge 2 commits into
v0.21from
mergify/bp/v0.21/pr-7235

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Dec 4, 2019

This is an automated backport of pull request #7235 done by Mergify.io

Cherry-pick of 369f37a has failed:

On branch mergify/bp/v0.21/pr-7235
Your branch is up to date with 'origin/v0.21'.

You are currently cherry-picking commit 369f37a0a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   genesis/src/main.rs
	new file:   genesis/src/validators.rs
	modified:   programs/stake/src/stake_state.rs
	modified:   programs/vote/src/vote_state.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   genesis/src/genesis_accounts.rs
	both modified:   genesis/src/lib.rs
	both modified:   genesis/src/stakes.rs

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

Mergify commands and options
More conditions and actions can be found in the [documention](https://doc.mergify.io/).

You can also trigger Mergify actions by commenting on this pull request:
  • @Mergifyio rebase will rebase this PR
  • @Mergifyio backports <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the simulator.

Finally, you can contact us on https://mergify.io/

@rob-solana
genesis validators (#7235)
fb55965 
* genesis validators

* slp1 nodes get 500SOL

* no commission

(cherry picked from commit 369f37a)

# Conflicts:
#	genesis/src/genesis_accounts.rs
#	genesis/src/lib.rs
#	genesis/src/stakes.rs
@mvines
Copy link
Copy Markdown
Contributor

mvines commented Dec 4, 2019

@rob-solana - can you take a look at this merge conflict please?

@codecov
Copy link
Copy Markdown

codecov Bot commented Dec 4, 2019

Codecov Report

Merging #7250 into v0.21 will increase coverage by 7.2%.
The diff coverage is 76.9%.

@@           Coverage Diff           @@
##           v0.21   #7250     +/-   ##
=======================================
+ Coverage   72.1%   79.4%   +7.2%     
=======================================
  Files        238     240      +2     
  Lines      49675   45692   -3983     
=======================================
+ Hits       35848   36285    +437     
+ Misses     13827    9407   -4420

@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 4, 2019
@solana-grimes
Copy link
Copy Markdown
Contributor

solana-grimes commented Dec 4, 2019

💔 Unable to automerge due to CI failure

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Dec 4, 2019
@rob-solana rob-solana closed this Dec 4, 2019
@mergify mergify Bot deleted the mergify/bp/v0.21/pr-7235 branch December 4, 2019 07:47
@rob-solana rob-solana restored the mergify/bp/v0.21/pr-7235 branch December 4, 2019 07:48
@rob-solana rob-solana reopened this Dec 4, 2019
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 4, 2019
@solana-grimes
Copy link
Copy Markdown
Contributor

solana-grimes commented Dec 4, 2019

💔 Unable to automerge due to merge conflict

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Dec 4, 2019
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 4, 2019
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Dec 4, 2019
@solana-grimes
Copy link
Copy Markdown
Contributor

solana-grimes commented Dec 4, 2019

💔 Unable to automerge due to merge conflict

@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 4, 2019
@solana-grimes
Copy link
Copy Markdown
Contributor

solana-grimes commented Dec 4, 2019

💔 Unable to automerge due to merge conflict

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Dec 4, 2019
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 4, 2019
@solana-grimes
Copy link
Copy Markdown
Contributor

solana-grimes commented Dec 4, 2019

💔 Unable to automerge due to merge conflict

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Dec 4, 2019
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 4, 2019
@solana-grimes
Copy link
Copy Markdown
Contributor

solana-grimes commented Dec 4, 2019

💔 Unable to automerge due to merge conflict

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Dec 4, 2019
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 4, 2019
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Dec 4, 2019
@solana-grimes
Copy link
Copy Markdown
Contributor

solana-grimes commented Dec 4, 2019

💔 Unable to automerge due to merge conflict

@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 4, 2019
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 4, 2019
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Dec 4, 2019
@solana-grimes
Copy link
Copy Markdown
Contributor

solana-grimes commented Dec 4, 2019

💔 Unable to automerge due to merge conflict

@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 4, 2019
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Dec 4, 2019
@solana-grimes
Copy link
Copy Markdown
Contributor

solana-grimes commented Dec 4, 2019

💔 Unable to automerge due to merge conflict

@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 4, 2019
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Dec 4, 2019
@solana-grimes
Copy link
Copy Markdown
Contributor

solana-grimes commented Dec 4, 2019

💔 Unable to automerge due to merge conflict

@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 4, 2019
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Dec 4, 2019
@solana-grimes
Copy link
Copy Markdown
Contributor

solana-grimes commented Dec 4, 2019

💔 Unable to automerge due to merge conflict

@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 4, 2019
@solana-grimes
Copy link
Copy Markdown
Contributor

solana-grimes commented Dec 4, 2019

💔 Unable to automerge due to merge conflict

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Dec 4, 2019
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 4, 2019
@solana-grimes
Copy link
Copy Markdown
Contributor

solana-grimes commented Dec 4, 2019

💔 Unable to automerge due to merge conflict

@CriesofCarrots
Copy link
Copy Markdown
Contributor

CriesofCarrots commented Dec 4, 2019

Oh no, 🤖 fight

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Dec 4, 2019
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 4, 2019
@solana-grimes
Copy link
Copy Markdown
Contributor

solana-grimes commented Dec 4, 2019

💔 Unable to automerge due to merge conflict

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Dec 4, 2019
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 4, 2019
@solana-grimes
Copy link
Copy Markdown
Contributor

solana-grimes commented Dec 4, 2019

💔 Unable to automerge due to merge conflict

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Dec 4, 2019
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 4, 2019
@solana-grimes
Copy link
Copy Markdown
Contributor

solana-grimes commented Dec 4, 2019

💔 Unable to automerge due to merge conflict

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Dec 4, 2019
@rob-solana rob-solana closed this Dec 4, 2019
@rob-solana rob-solana deleted the mergify/bp/v0.21/pr-7235 branch December 4, 2019 07:51
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@mvines @solana-grimes @CriesofCarrots @rob-solana